Be more careful with visibility. Also: without the type annotation, Scala 2.11 gets the output types wrong for DSL surface syntax.