David and I have been discussing off-list, but the patch (adding all
three features) is now available on the JIRA.