Refactored these into the util subpackage, with more specific names, as that seems to be the project norm.