Fix the flattening of the various AWS env vars we look for