Clean up Scope.ooc a bit.