Change directive so it always has an app, and make the discriminator
use app automatically; all directives are scoped in app.