Another cleanup of extractors and serializers; hopefully the last