Operators factored out.
build.sbt: -deprecation added
first refactoring