[PATCH] transforms to handle CCIs as refs not idents