convert numeric macros to compile time constants
cleanup the last of the macro mess