Added macro heuristics to checker and ranker.