diff --git a/pymbolic/mapper/__init__.py b/pymbolic/mapper/__init__.py
index a2d4ec5c4c29bede248e7d97b1ad81eada21ac99..a08d4d6a8f861ba65e185ca11cd846036c7cc963 100644
--- a/pymbolic/mapper/__init__.py
+++ b/pymbolic/mapper/__init__.py
@@ -123,10 +123,8 @@ class CombineMapper(RecursiveMapper):
             self.rec(expr.numerator, *args),
             self.rec(expr.denominator, *args)))
 
-    def map_floor_div(self, expr, *args):
-        return self.combine((
-            self.rec(expr.numerator, *args),
-            self.rec(expr.denominator, *args)))
+    map_floor_div = map_quotient
+    map_remainder = map_quotient
 
     def map_power(self, expr, *args):
         return self.combine((
@@ -206,6 +204,7 @@ class IdentityMapperBase(object):
                               self.rec(expr.denominator, *args))
 
     map_floor_div = map_quotient
+    map_remainder = map_quotient
 
     def map_power(self, expr, *args):
         return expr.__class__(self.rec(expr.base, *args),