simplify upump_mgr and uclock helpers

As suggested by Bencoh.