Completed rewrite merge by moving newparse -> parse.