Sure would be nice if we could get rid of this one. I wonder how much work it would be? (Shouldn't be done in this series of commits as it's very long as is.)