Remove internal references to $*OS

So that we don't generate deprecated warnings when just running core functions