Fixed driver code to work with the new parser.
Small code cleanups.