diff --git a/doc/mappers.rst b/doc/mappers.rst
index c41842760ade982ac39a386739577be6a3907133..93d39b42183a6e505db18a4aa667f9fd8a1cd7d9 100644
--- a/doc/mappers.rst
+++ b/doc/mappers.rst
@@ -3,7 +3,6 @@ Mappers
 
 .. automodule:: pymbolic.mapper
 
-
 More specialized mappers
 ------------------------
 
@@ -14,44 +13,27 @@ Converting to strings and code
 
 .. automodule:: pymbolic.mapper.c_code
 
-.. autoclass:: CCodeMapper
-
 .. automodule:: pymbolic.mapper.graphviz
 
-.. autoclass:: GraphvizMapper
-
-
 Some minimal mathematics
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. automodule:: pymbolic.mapper.evaluator
 
-.. autoclass:: EvaluationMapper
-
 .. automodule:: pymbolic.mapper.differentiator
 
-.. autoclass:: DifferentiationMapper
-
 .. automodule:: pymbolic.mapper.distributor
 
-.. autoclass:: DistributeMapper
-
 .. automodule:: pymbolic.mapper.collector
 
-.. autoclass:: TermCollector
-
 .. automodule:: pymbolic.mapper.constant_folder
-
-.. autoclass:: ConstantFoldingMapper
-.. autoclass:: CommutativeConstantFoldingMapper
+.. automodule:: pymbolic.mapper.substitutor
 
 Finding expression properties
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. automodule:: pymbolic.mapper.dependency
 
-.. autoclass:: DependencyMapper
-
 .. automodule:: pymbolic.mapper.flop_counter
 
 .. autoclass:: FlopCounter
diff --git a/pymbolic/mapper/c_code.py b/pymbolic/mapper/c_code.py
index aed3867b2bad933d0625d3575e7f230d65698c2d..13bd811bdf2c519cbfc0e00c9386d4edc85e3514 100644
--- a/pymbolic/mapper/c_code.py
+++ b/pymbolic/mapper/c_code.py
@@ -1,3 +1,7 @@
+"""
+.. autoclass:: CCodeMapper
+"""
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/collector.py b/pymbolic/mapper/collector.py
index a0922433a7bac4964d8732ee7a544a2b431e61f1..17865a112e45df9ce20ab1bee2a8ba24428ebcd4 100644
--- a/pymbolic/mapper/collector.py
+++ b/pymbolic/mapper/collector.py
@@ -1,3 +1,7 @@
+"""
+.. autoclass:: TermCollector
+"""
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/constant_folder.py b/pymbolic/mapper/constant_folder.py
index 724c77004a5fe4861d7022b5417e4515b9d3815d..e8ab531b79bbf7ae4cc8f65ebd1ddaac20cd983e 100644
--- a/pymbolic/mapper/constant_folder.py
+++ b/pymbolic/mapper/constant_folder.py
@@ -1,3 +1,8 @@
+"""
+.. autoclass:: ConstantFoldingMapper
+.. autoclass:: CommutativeConstantFoldingMapper
+"""
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/dependency.py b/pymbolic/mapper/dependency.py
index 09497dacdd94823f48009145dffb50137c49b238..b40f8c133340dd51f6da5a5ac8da745c91fc0dad 100644
--- a/pymbolic/mapper/dependency.py
+++ b/pymbolic/mapper/dependency.py
@@ -1,3 +1,8 @@
+"""
+.. autoclass:: DependencyMapper
+.. autoclass:: CachedDependencyMapper
+"""
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/differentiator.py b/pymbolic/mapper/differentiator.py
index be70be68b7ce46b1af5eb839f9ad08d6d87f8d19..8d7d4dd934288dfd7ad9a84bb95f5e2038a79af0 100644
--- a/pymbolic/mapper/differentiator.py
+++ b/pymbolic/mapper/differentiator.py
@@ -1,3 +1,7 @@
+"""
+.. autoclass:: DifferentiationMapper
+"""
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/distributor.py b/pymbolic/mapper/distributor.py
index 13c9831c3cf02d398d7ee780b3898f0148f96d8f..9f73efdc5585cd60a7cb0a128076a65c5cccfd84 100644
--- a/pymbolic/mapper/distributor.py
+++ b/pymbolic/mapper/distributor.py
@@ -1,3 +1,9 @@
+"""
+.. autoclass:: DistributeMapper
+.. autofunction:: distribute
+"""
+
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/evaluator.py b/pymbolic/mapper/evaluator.py
index 1f665e3bd9256257bf2522f5b3e2d586e7dfb1d4..22fd397d704aa2a822d831d0e8565347c0fa7008 100644
--- a/pymbolic/mapper/evaluator.py
+++ b/pymbolic/mapper/evaluator.py
@@ -1,3 +1,14 @@
+"""
+.. autoclass:: EvaluationMapper
+.. autoclass:: CachedEvaluationMapper
+.. autoclass:: FloatEvaluationMapper
+.. autoclass:: CachedFloatEvaluationMapper
+
+.. autofunction:: evaluate
+.. autofunction:: evaluate_kw
+.. autofunction:: evaluate_to_float
+"""
+
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/graphviz.py b/pymbolic/mapper/graphviz.py
index edc88ec7c50f3ab70db26577dc317d091d9b8577..71eb3cbbdf3f81fb5fc6d540b7f281c1ee39c125 100644
--- a/pymbolic/mapper/graphviz.py
+++ b/pymbolic/mapper/graphviz.py
@@ -1,3 +1,7 @@
+"""
+.. autoclass:: GraphvizMapper
+"""
+
 __copyright__ = "Copyright (C) 2015 Andreas Kloeckner"
 
 __license__ = """
diff --git a/pymbolic/mapper/substitutor.py b/pymbolic/mapper/substitutor.py
index abddfa78208f3ceb9f5a51b9474caae1a2fb7769..d294d234f8a4303fe4bb02f0688a80d687463fdf 100644
--- a/pymbolic/mapper/substitutor.py
+++ b/pymbolic/mapper/substitutor.py
@@ -1,3 +1,10 @@
+"""
+.. autoclass:: SubstitutionMapper
+.. autoclass:: CachedSubstitutionMapper
+.. autofunction:: make_subst_func
+.. autofunction:: substitute
+
+"""
 __copyright__ = "Copyright (C) 2009-2013 Andreas Kloeckner"
 
 __license__ = """