Clean and comment Kinesis enrichment for #489.