Issue #89 - More sanity where variable substitution is concerned.  Now support senderAddress.