Convert expressions to target field format

Fix #11000
Fix #10995
Fix #10993
+1 to Nathan's comments