In the middle of switching this tiny operation to its own module.

I'll continue tomorrow.