Reg Z Fixes

* Pull Upstream
* Better disambiguation of paragraphs
* Better "collapsed" markers parsing
* Italic levels of hierarchy
* Misc fixes
* Tests for all these changes