Improve enum flattening behaviour

Unit variants of externally-tagged enums were previously not flattened correctly