Property interpolation fix for `@*` values

Fixes #2133 and #2168.