merge: consistently use "x" instead of 'x' for internal action types This makes it simpler to search for places where the action types are handled.