Eliminate _has_perm inconsistencies and cruft