Adapts code to interface changes of geom-0.12-SNAPSHOT, still one failing unit test, not sure how to fix.