simplify some of the uniform handling further