@fawce we might want to confer about thinking on this, I had moved these previously with this commit, 6f1cbcbc4ffdd021078fea6e2bbefc3b773cc275

But I could be approaching the semantics of placement, incorrectly.

(Just calling out because it had to reread to check if we were adding new fields etc.)