Fixes to avoid warnings of redundant definitions with Portland compiler.