Minor simplification in VALID-ID?