Correct spelling:  BOOLOR_TOGGLE -> BOOL_OR_TOGGLE
Parsing:  Few cleanups

* Make note of a few definitions which will need defining;
* Flesh out AddButtonStyle a bit more.