Fixed the grammar so that all the tests pass.

Made some changes to the grammar, and some of the tests, so that they
all pass. Removed objects for the time being. It still gives some
"missing return statement in function" errors, but I have no idea where
those are coming from.