Minimising the references to JDO, for when the enhancement contract is
not JDO