Undid changes where contextual semantics are taken into account.

The idea is that if we are going to use contextual semantic meanings, we should be using them in a consistent and correct way all at once (which is a slightly long-running task). Otherwise the current consistencies will actually make the experience somewhat inconsistent.