I feel your pain, and I try to do this when possible. In this case they were difficult to separate because a lot of things needed to be moved around for the new world order of using mapState.js.