Fix unix env. var addition issue when the variables may have elements with spaces in them.