I think you want to keep the version in master for this code, where I extracted a local to avoid redundant property indexing, etc.