Clean up DatastreamParser and fix test.
Rename const field.