Reduce the number of functions taking options.

Pass by value in a few more places.

This version will be incompatible with es6-module-loader.