Index: trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java	(revision 4851)
@@ -52,4 +52,9 @@
     }
 
+    public AbstractMergeAction(String name, String iconName, String tooltip, Shortcut shortcut,
+    boolean register, String toolbar, boolean installAdapters) {
+        super(name, iconName, tooltip, shortcut, register, toolbar, installAdapters);
+    }
+
     protected Layer askTargetLayer(List<Layer> targetLayers) {
         JComboBox layerList = new JComboBox();
Index: trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java	(revision 4851)
@@ -33,10 +33,7 @@
                 "dialogs/changeset/changesetmanager",
                 tr("Toggle visibility of Changeset Manager window"),
-                Shortcut.registerShortcut(
-                        "menu:windows:changesetdialog",
+                Shortcut.registerShortcut("menu:windows:changesetdialog",
                         tr("Toggle visibility of Changeset Manager window"),
-                        KeyEvent.VK_C,
-                        Shortcut.GROUPS_ALT2 + Shortcut.GROUP_HOTKEY
-                ),
+                        KeyEvent.VK_C, Shortcut.GROUPS_ALT2 + Shortcut.GROUP_HOTKEY),
                 true /* register shortcut */
         );
Index: trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java	(revision 4851)
@@ -33,13 +33,10 @@
     public CloseChangesetAction() {
         super(tr("Close open changesets"),
-                "closechangeset",
-                tr("Closes open changesets"),
-                Shortcut.registerShortcut(
-                        "system:closechangeset",
-                        tr("File: {0}", tr("Closes open changesets")),
-                        KeyEvent.VK_Q,
-                        Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2
-                ),
-                true
+            "closechangeset",
+            tr("Closes open changesets"),
+            Shortcut.registerShortcut("system:closechangeset",
+                tr("File: {0}", tr("Closes open changesets")),
+                KeyEvent.VK_Q, Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
+            true
         );
         putValue("help", ht("/Action/CloseChangeset"));
Index: trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/Map_Rectifier_WMSmenuAction.java	(revision 4851)
@@ -70,7 +70,6 @@
                 Shortcut.registerShortcut("wms:rectimg",
                         tr("WMS: {0}", tr("Rectified Image...")),
-                        KeyEvent.VK_R,
-                        Shortcut.GROUP_NONE),
-                        true
+                        KeyEvent.VK_R, Shortcut.GROUP_NONE),
+                true
         );
 
Index: trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java	(revision 4851)
@@ -17,11 +17,10 @@
 
     public MergeLayerAction() {
-        super(tr("Merge layer"), "dialogs/mergedown", tr("Merge the current layer into another layer"), Shortcut
-                .registerShortcut("system:merge", tr("Edit: {0}", tr("Merge")), KeyEvent.VK_M, Shortcut.GROUP_MENU),
-                false /* register */
-                );
+        super(tr("Merge layer"), "dialogs/mergedown",
+            tr("Merge the current layer into another layer"),
+            Shortcut.registerShortcut("system:merge", tr("Edit: {0}",
+            tr("Merge")), KeyEvent.VK_M, Shortcut.GROUP_MENU),
+            true, "action/mergelayer", true);
         putValue("help", ht("/Action/MergeLayer"));
-        putValue("toolbar", "action/mergelayer");
-        Main.toolbar.register(this);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/UpdateDataAction.java	(revision 4851)
@@ -26,7 +26,6 @@
                 Shortcut.registerShortcut("file:updatedata",
                         tr("Update data"),
-                        KeyEvent.VK_U,
-                        Shortcut.GROUP_HOTKEY),
-                        true);
+                        KeyEvent.VK_U, Shortcut.GROUP_HOTKEY),
+                true);
         putValue("help", ht("/Action/UpdateData"));
     }
Index: trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java	(revision 4851)
@@ -26,6 +26,5 @@
                 tr("Updates the currently modified objects from the server (re-downloads data)"),
                 Shortcut.registerShortcut("file:updatemodified",
-                        tr("Update modified"),
-                        KeyEvent.VK_M,
+                        tr("Update modified"), KeyEvent.VK_M,
                         Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
                         true);
Index: trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java	(revision 4851)
@@ -87,8 +87,7 @@
                 tr("Updates the currently selected objects from the server (re-downloads data)"),
                 Shortcut.registerShortcut("file:updateselection",
-                        tr("Update selection"),
-                        KeyEvent.VK_U,
+                        tr("Update selection"), KeyEvent.VK_U,
                         Shortcut.GROUP_HOTKEY + Shortcut.GROUPS_ALT2),
-                        true);
+                true);
         putValue("help", ht("/Action/UpdateSelection"));
     }
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 4850)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java	(revision 4851)
@@ -98,6 +98,6 @@
     public ImproveWayAccuracyAction(MapFrame mapFrame) {
         super(tr("Improve Way Accuracy"), "improvewayaccuracy.png",
-                tr("Improve Way Accuracy mode"), Shortcut.registerShortcut(
-                "mapmode:ImproveWayAccuracy",
+                tr("Improve Way Accuracy mode"),
+                Shortcut.registerShortcut("mapmode:ImproveWayAccuracy",
                 tr("Mode: {0}", tr("Improve Way Accuracy")),
                 KeyEvent.VK_I, Shortcut.GROUP_EDIT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));