This works surprisingly well (names work, type checking works) https://github.com/pantsbuild/pants/compare/main...chrisjrn:pants:chrisjrn/extract-environment-specific-options?expand=1