Don't substitute property access

Closes #14