Separate excellon exporting within the gerber plugin. Although the two formats are similar, and the aperutre part is shared, they really don't have much in common. UI-wise, they will be two separate exporters long term.
Upgrade the CAM to handle drills and mutli-layer exports better, to provide a more sustainable alternative to the old gerber naming style mechanism.