Speed up deserialization

@swankjesse 
@adriancole