Update getType to work with new parsing

Todo:

* expand to use all the F omega rules (sigh)
* evaluation still needs to be fixed