Some reformatting of parser to fix offside errors.
Replaced some uses of the (o) operator with (<<).