- Converted some macros to inlined functions.