Looks to me like you've got it under control, Gary. And you're familiar with the three-cemeteries situation, so you can probably tell how far you need to go in the disambiguation effort. But over-documenting it would be preferable to under-documenting.