Began new, simpler type checking scheme.