Changes to help Eclipse code completion problem.