Further cleanup and using all static inlines versus defines.  Renamed a 
couple of functions to make them clearer.

Dan