* commit 'af7cf1c495a660170c5907d7cc038fa2521f8d58': Reduce overly aggressive use of narrowAm / narrowPm.