Commit with a few broken bits to save refactoring from nearly-dead eclipse install