Massive tidyup of extractors and serializers