Fixes #1796; Also fix custom-simple-xxxxx bug where pick_val could still be filled in for a custom-simple field, which will display weird in the field editor