Change NUM_* macros so they make sense