Get rid of P_? macros; rename NUMBER to ARRAYSIZE.