Add missing files.

Forgot to push, previously.
Use OneShotIterable in all mappers, publicly.