- various "cosmetics" cleanups to shut up gcc complaints on higher warning