Beginning the refactoring of the CRef stuff gh-67