Update some parsers to new interface