Clean up IsLis & IsAddic to avoid false positives