Did some cleanup/refactoring. Good safe point before Phu and I mess up
our eCore diagram.