issue #21672: Move globally applicable definitions to core.