Add parsing support for do forms.
Remove extraneous console.log statements.
Add spec for if statement without else part.
Minor refactoring.