Yes, this section should be changed. At the very least it should be made more declaratively.This seems related to what we were talking about today in the channel about moving configuration to the enhancer in the preview component.