Apply some code cleanups that apparently fix Solaris 7 gcc problems.