Further factoring in datatype heuristics