Refactor: Replace macros with inline functions