Fix Eclipse compiler warnings

I've split the various fixes into separate commits to illustrate why/how I fixed certain warnings.
I actually prefer that we suppress warnings at the narrowest place possible. There's a lot of code in this class, and I'd like to see if we introduce new references to deprecated code