Revisions to 38-40.

Today is torture night! Reducing when I should map, and mapping when I
should reduce, oh my.