Make heuristic parameter list check more specific