Refactoring code to avoid warnings.

One more try.