You're correct in guessing that I'm being conservative here.  I'm trying to maintain the behavior I found, because I don't know what depends on it.  If, as you say, we can count on MAKO_MODULE_DIR always being set in the environment, then we can get rid of this.  I take it that's a safe assumption?