Nice refactor, getting us towards a straight jcr dependency instead of modeshape.