Clean up some inline methods.