Attempt to thwart mapping-style bob solutions.

Note: this introduces a dependency on 1.9.3. Is that OK, or should I reimplement this using 1.8.7 features?