Add NUMPAD_1 to match NUMBERS_1 to avoid inline formatting, also de-duplicate logic that uses both NUMBERS_1 & NUMPAD_1.
c6db3f98bb