CalChart::Mode should be able to generate more of the Draw commands. Move from GenerateModeDrawCommands to CalChartMode.