Warnings cleanup.
Merge pull request #563 from cgay/warnings

Warnings cleanup.