Looking at this now. Initially I was thinking the Expr text could be expanded to Expression, but I see that Env (in EnvVar, ePropertyEnvVars, etc.) is also already similarly abbreviated, so this is not really out of line for that code. So just a minor nit but is probably fine. Going to test it a bit. http://reviews.llvm.org/D5472