Fix for #1760

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