Eclipse fixes (using aspectj).