SWC-805 Use new access to simple parsers and clean up code