Add missing braces

Reviewed by:	swildner@dragonflybsd.org
Reviewed by:	delphij
Remove ancient compatibility cruft.

Reviewed by:	delphij