Not sure whether my refactoring in PR #645 changes this (it could well do).