hmm.. good point.  Now that I have a better understanding of how these environment variables are imported - yes, it makes sense to do this.  I have changed the code as you suggest.