* ditch some inline functions and replace them with a macro