headers, and a few other insignificant changes.
rather than lex/yaccing them ourselves. still don't know why these don't get flexed right...