Remove a couple of places where we could get stack overflows