Cleaned up the changes to the semantics.