I will do in in an extra issue and pull request. See #1135.