Re #1115 refactoring