I think I'm fine with this, as it should be used in very few places at this point.