Macros to inline functions

[Kiriti]

Macros are hard to debug, making them inline functions would be helpful