diff --git a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
index 6d2f50e7640..7e3603bb4de 100644
--- a/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
+++ b/dsf/org.eclipse.cdt.dsf.ui/src/org/eclipse/cdt/dsf/debug/ui/viewmodel/variable/VariableCellModifier.java
@@ -42,6 +42,9 @@ public class VariableCellModifier extends WatchExpressionCellModifier {
         return null;
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.WatchExpressionCellModifier#canModify(java.lang.Object, java.lang.String)
+     */
     @Override
     public boolean canModify(Object element, String property) {
         // If we're in the column value, modify the register data.  Otherwise, call the super-class to edit
@@ -60,6 +63,9 @@ public class VariableCellModifier extends WatchExpressionCellModifier {
         return super.canModify(element, property);
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.WatchExpressionCellModifier#getValue(java.lang.Object, java.lang.String)
+     */
     @Override
     public Object getValue(Object element, String property) {
         // If we're in the column value, modify the variable value.  Otherwise, call the super-class to edit
@@ -95,12 +101,18 @@ public class VariableCellModifier extends WatchExpressionCellModifier {
         return super.getValue(element, property);
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.cdt.dsf.debug.ui.viewmodel.expression.WatchExpressionCellModifier#modify(java.lang.Object, java.lang.String, java.lang.Object)
+     */
     @Override
     public void modify(Object element, String property, Object value) {
-        /* 
-         * If we're in the column value, modify the register data.  Otherwise, call the super-class to edit
-         * the watch expression.
-         */ 
+		/*
+		 * If we're in the Value column, modify the variable/register data. The
+		 * other columns in the Variables and Registers view are non-modifiable.
+		 * If we're called for another column, pass the request to our super
+		 * class; the column is likely a column it handles (Expression, for
+		 * example).
+		 */ 
         if (IDebugVMConstants.COLUMN_ID__VALUE.equals(property)) {
             if (value instanceof String) {
                 /*