Fix infer datatypes: infer no longer marks inferred items with a *, so that it can return values that are of the original datatype.