Some more work on the breakindent patch