Refactoring variable substitution into runtime expression