I got to the trouble point: when the macro name is stripped of the question mark, the single quotes around the name are left there, but should be removed.

Updating tickets (#324, #124, #178, #272, #353, #356, #51, #173, #202, #250, #263, #284, #295, #300, #303, #304, #306, #310, #319, #320, #329, #330, #334, #337, #357, #257, #305, #315)