Docx reader: Code cleanup in parse.

Remove some redundant ways of dealing with Maybe.
Merge pull request #1375 from jkr/cleanup

Docx reader: Code cleanup in parse.