Cleaned up parser.

Formatting changes.

Also removed the bundle functions and now handle the bundling of
functions and type declarations inside the grammar itself.