Remove exception control flow
Cleaned grammar construction up (a bit)
Cleaned up node construction