More serializer cleanupping

Cleaned up most of the Binary serialization.