Fix for #1760

Fixes property interpolation (#1760). Now variables of any type (and their combinations) should expand properly.