Merge pull request #9416 from Filoppi/patch-9 InputCommon: Wrap remaining invalid default input expressions around ``
