BZ-0000: Code cleanup, removing unnecessary dependencies, moving common code into MEI types.