Added a whole pile of BS code to deal with Hibernate and lazy-loading OneToOne relationships.