Factor out CCO voodoo