Additional changes required by r223433.
Changes to the expression parser to actually use
the types that we find in Clang modules.