--- a/accessible/base/Filters.cpp
+++ b/accessible/base/Filters.cpp
@@ -42,20 +42,17 @@ filters::GetRow(Accessible* aAccessible)
     return eSkip;
 
   return eSkipSubtree;
 }
 
 uint32_t
 filters::GetCell(Accessible* aAccessible)
 {
-  a11y::role role = aAccessible->Role();
-  return role == roles::CELL || role == roles::GRID_CELL ||
-         role == roles::ROWHEADER || role == roles::COLUMNHEADER ?
-    eMatch : eSkipSubtree;
+  return aAccessible->IsTableCell() ? eMatch : eSkipSubtree;
 }
 
 uint32_t
 filters::GetEmbeddedObject(Accessible* aAccessible)
 {
   return nsAccUtils::IsEmbeddedObject(aAccessible) ?
     eMatch | eSkipSubtree : eSkipSubtree;
 }