Added better statement type parser.
More PG work.