Nice clean-up here. This always seemed a bit more complicated than it should be.