Similar to D11747, except for Entry.

Depends on D11747

flow + close reading.

Will test generally at end to make sure things work as expected. Don't think it's practical to manually test each of these trivial changes.