map-classes-in-module, map-types-in-module: Fix off by one error.