Clean up errors in implicitCastTo refactoring not caught by the C++ compiler.
Merge pull request #3248 from yebblies/implicitcasttofixup

Clean up errors in implicitCastTo refactoring not caught by the C++ compiler