Handle more Stmt forms
Tidy up a bit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/parse/typecheck.cpp
Merge branch 'typecheck'