This generally replaces device_type with execution_space
and DeviceType with ExecutionSpace except for some places where
the new compound device_type should be used.