Refactor to remove FORMFIELDSPEC and rationalise storage.