Moved to Hibernate 4.3.6. Little clean-up as well.