Changes to fix compiler warning from Ubuntu's new strict compiler
defaults. RollOverTests still has compiler warnings, but that's the
point of the test.