Extension enumerations now only included where necessary.