Remove inline from some functions that didn't need to be inline
(and probably weren't being inlined by the compiler anyway)