More thoughts on parsing cleverness. Probably about to go less clever.
Simpler recursive parsing.