Cleaner serialize_fields() implementations.
Remove testing hackery.