Clean up mistakes from d63c53e.

Add missing braces, avoid unnecessary variables.

Noticed by:	fgs