Redo inlining patch, plus some tidying up