Update make-environ to be more robust