fix more CCEs from casts to ReifiedType