Minor cleanup.
Bug fix: remove lingering variable reference.
Don't abort package build on missing modulefile.  If an mkl modulefile is
presently, load it when appropriate.