I've got a few changes in the pipeline that will start a deprecation clock ticking, so I do want to get them into 2.16. Could get them all in this weekend with some code reviews :)