Parsing updates

* Simplified!
* Generalized!
* Optimized!

 (see commit messages for specific details)