Better handling of open brace outdenting, 'naked' token walking