Accept comma as <switch> delimiter

Change-Id: I7b4ac17003cf65d30e348af9476a026372ecf370