Changed keywords and predeclared types. This is not done yet, but it's
past 2 in the morning, and I want to get to bed.