93274977

By: Greg Pfeil <greg@technomadic.org>

Deduplicate and fix some utility operations

The duplication led to some errors, where the “same” function behaved
differently, because only one copy had been fixed in an earlier change.