Don't use each_with_object everywhere...