issue #2300: Warning fixes.