Parse complex enum fields prior to per-language logic, drop java-isms in TS