Fix more semantics.