annotating datapoint parsing. no functional changes.