Improve startup time

Avoid unnecessary transcoding of inputs and map in one go rather than
two.