Remove scope clutter and fix directive usage within transcluded templates