Minor fixup M-{N,P}