Turns out the ownProps we were getting in react-redux's mapDispatchToProps somewhat sensibly doesn't yet include the results of mapStateToProps and so the fix that prevented us from always having to pass this.props to mutators turned out to be incomplete.

Luckily that data is available from the store, unfortunately it's not in quite the right shape. I made a somewhat ungainly fix that iterates through the keys of the every time substitution is attempted and made to document the need to structure things better.