Move curly braces out of declaration list
Strip out broken declaration list code
Make it cope with newlines
Extend support to blue!