Re #945 Finalizing the right reusability feature.