Use correct XXX2NUM macros