Use inline functions instead of macros for a couple of things
2 files changed