This and RecordIdBinder seem really out of place in this PR. Do they belong here?