Moving some constants around. Getting DxIOTest to pass its test.