Replace MACROs with inline functions again