In the process of this many changes were made to try to make keeping up with the Eclipse-JDT code base as easy as possible in the future.