Is there a reason for allowing so many machine types? What if we want to add a machine type with a '-' in it? I'm thinking we may want to just stick with commas.