That is a much cleaner solution! Thanks - I'll merge it in.

And an empty flavor is probably unrealistic anyway, so this should be fine.