Cleaning things up in preparation for the compare with EM version.