Switched to DataNucleus 4.0.2 and fixed minor aesthetic things.