'nother round of refactoring on inline