Minor modifications to Spring scanner code to avoid side-effects in Eclipse