cosmetics: cleanup, getting rid of warnings.