Fix grabbing parse credentials from env.

It's simpler now, and supports assembling both build types in one run.