More Eclipse warning cleanup.