Having spoken to @julry, this is included in the next stratified pull request.