Change semantics to match what we discussed.