(The simpler solution also has the benefit of using the model-configured code list. As you know, those can vary between MDES versions.)