Minor cleanup in build and env var handling

[jamesward]

Note that the commits inadvertently were authored by pkl-cicd due to https://github.com/apple/pkl-package-docs/issues/4

[bioball]

Thanks!