Tweaks to how output_transform gets passed around.