Cleanup parsing, simplify.