Refactor: use PropertyAccess rather than varvar