some cleanup after https://bugs.eclipse.org/bugs/show_bug.cgi?id=406646
7 files changed