Simplify scopes on content directives. Fixes #284.