Adding design-time support

well the compelling reason not would to be able to property write tests for this code. If it's not something you have planned then let's leave it be.