Tiny refactor and JTS version upgrade.