Heuristic changes. Definition checking is more exact.