Another patch in preparation for Evolution.