Reduce overlinking
Also add some missing $FreeBSD$ to keep svn happy.
This will make a number of things easier in the future, as well as (finally!) avoiding the Id-smashing problem which has plagued developers for so long. Boy, I'm glad we're not using sup anymore. This update would have been insane otherwise.
Reviewed by: Geoff Submitted by: John Brezak