add CC fields to closures generated by shims (may not complete and some cost-centres may be wrong)