UNDO: Be a little keener to inline