Fixing an artifact of a merge
Distinguish `has type' from equivalent type
Reformulated filterCells