Added lots more key macros and moved several short inline functions into the header file