Refactoring dependency properties in preparation for inheritance / two-way binding