WIP: squash into 93018bbb375d3f11e292501d7ec9099c34d1d7ce (do not pass transclusion into template directive)

Process Igor’s comments.