Beat me to it. :o)
That said, my fix was different. Are you sure the expressed goal of 'Avoid emitting CastExp' is still adequately met by the modified code?