Lots of small fixes for Bro grammar.