Re #1038 refactoring