Fixes #1201 and related issues; Fixed field saving handling of $old_definition