R1:4169d7bfd5b1

Fix an issue where Harbormaster might cycle while saving

The way custom field interact with storage is a little odd, and can send us
down a bad path when applying external effect while saving changes.