Fix some ValueSpace expectations.