Additional parser changes

Replaces https://github.com/openmicroscopy/openmicroscopy/pull/2843