Also change the #define functions into inline functions to help
catch any future paramater mis-matches.

And clean up a few minor style issue...