Handle @enum where type is declared before variable

Handle @enum where type is declared before variable #516