Improvements to the serializer plugin.