Replaced the remaining macro with an inline function, for readability.
Marked the private variables and functions as such.