SI-4918 Remove val in for comprehension value definitions