Improve clarity (and small speed-up) by using tuple unpacking (#3289)

1 file changed