Commit after fixing Eclipse Context Assist problem.