Mynde to merge

Misc cleanup ahead of Mynde get/set implementation.