Adapt to bbrowning's PropertyDescriptor performance enhancements.

Also clean up a few tests.