PNG special case no longer needed, with new heuristic.