semantic fixes.

Didn't you already extract this in line 57?