Clean up IsLis & IsAddic to avoid false positives
merge to origin/master