diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx
index 5fd9a10cf..89fad0d1b 100644
--- a/src/debugger/CartDebug.cxx
+++ b/src/debugger/CartDebug.cxx
@@ -1136,14 +1136,14 @@ string CartDebug::saveDisassembly()
       << "; ROM properties name : " << myConsole.properties().get(PropType::Cart_Name) << "\n"
       << "; ROM properties MD5  : " << myConsole.properties().get(PropType::Cart_MD5) << "\n"
       << "; Bankswitch type     : " << myConsole.cartridge().about() << "\n;\n"
-      << "; Legend: *  = Device::CODE not yet run (tentative code)\n"
-      << ";         D  = Device::DATA directive (referenced in some way)\n"
-      << ";         G  = Device::GFX directive, shown as '#' (stored in player, missile, ball)\n"
-      << ";         P  = Device::PGFX directive, shown as '*' (stored in playfield)\n"
-      << ";         C  = Device::COL directive, shown as '*' (stored in player color)\n"
-      << ";         CP = Device::PCOL directive, shown as '*' (stored in playfield color)\n"
-      << ";         CB = Device::BCOL directive, shown as '*' (stored in background color)\n"
-      << ";         A  = Device::AUD directive, shown as '*' (stored in audio registers)\n"
+      << "; Legend: *  = CODE not yet run (tentative code)\n"
+      << ";         D  = DATA directive (referenced in some way)\n"
+      << ";         G  = GFX directive, shown as '#' (stored in player, missile, ball)\n"
+      << ";         P  = PGFX directive, shown as '*' (stored in playfield)\n"
+      << ";         C  = COL directive, shown as color constants (stored in player color)\n"
+      << ";         CP = PCOL directive, shown as color constants (stored in playfield color)\n"
+      << ";         CB = BCOL directive, shown as color constants (stored in background color)\n"
+      << ";         A  = AUD directive (stored in audio registers)\n"
       << ";         i  = indexed accessed only\n"
       << ";         c  = used by code executed in RAM\n"
       << ";         s  = used by stack\n"
diff --git a/src/emucore/Device.hxx b/src/emucore/Device.hxx
index d60ec7054..d8b9cbaa9 100644
--- a/src/emucore/Device.hxx
+++ b/src/emucore/Device.hxx
@@ -54,7 +54,7 @@ class Device : public Serializable
       PCOL  = 1 << 6,  // 0x040, addresses loaded into COLUPF register
       BCOL  = 1 << 5,  // 0x020, addresses loaded into COLUBK register
       AUD   = 1 << 4,  // 0x010, addresses loaded into audio registers
-      DATA  = 1 << 3,  // 0x008, addresses loaded into registers other than GRPx / PFx
+      DATA  = 1 << 3,  // 0x008, addresses loaded into registers other than GRPx / PFx / COLUxx, AUDxx
       ROW   = 1 << 2,  // 0x004, all other addresses
       // special type for poke()
       WRITE = TCODE    // 0x200, address written to