Upgrading to astyle 2.04: see changes at http://astyle.sourceforge.net/notes.html