pull in c4 code generator fixes for odd edge cases from AVAnimator