While I'm here:

- Whitespace alignment
- Re-order a couple of Makefile entries

Submitted by:	koobs@FreeBSD.org