More function inlining

I may be wrong. This can lead to slowdowns if compiler gets it wrong.