Refactoring of some inline methods.