SI-4918 [2.11] Remove val in for comprehension value definitions