Removed more inline functions.