More runtime checks; Fix omission of type-assignment.