Fix short block setter call end location (#17039)