Improvement to Consumes Deserialization

Closes #657. Related: #713 and #657
No, that's the pattern we use on all classes.