jhm: Update for move to <util/>