Update to reflect implementation reality.