Adapting some constants for Foundation 5