Improved variable substitution support.