Even more cleanup: try to get to the point where even more can be
simplified / combined