Pulled out of my big series since these are fairly standalone changes The series folds some single-use functions together and shovels around some code so it lives in a more sensible location. No functional changes.