Some cleanup and refresh to the latest SimpleJPA in preparation to move over to SPA instead.