Make cypher-compiler-2.0 compile (except for tests)