For better type safety: replace macros with inline functions.
Note: kept some strange formatting for easier diff/review.