Invented a sort-of namespace and made these static; moved them to a move relevant location.