[Fix] Fix incorrect context treatment inObjectPropertyCollectionDescriptor. (commit: 8936adc)
Minor code improvements and cleanup. (commit: 6207b27)