Minor refactoring to ambient overlay variables.