Some ERI cleanup.