This ticket will investigate/experiment with changing macros (where feasible) to inline functions and get an idea of the potential improvements to code coverage, and whether there are any downsides (eg on performance).