Another tweak to the enumeration elaboration code