Re-factored code to significantly change what parse trees were produced.