Minor cleanups to suit Eclipse.