clean up some type synonyms and flesh out the statement parser