Move a couple inline functions into the header