I left the auto-indenter on while editing, I'll remove indentation from the rest of the patch if you prefer.