Add basic choice and option types.