More refactoring; simplify inline processing too