(Minor) Semantics Cleanup