Move a couple of stray subs to Ebooksforlib::Util