Clean things up a bit and add some support for the cernlib linkage.
Clean things up a bit and add some support for the cernlib linkage.

SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack,SixTrack/SixTrack