Resolved some metadata goofs, but it's still doing something strange.
Somehow, the metadata is getting altered such that I get CLAY_ADDED.
I need to figure out what else touches that field.