Comparing #4345 (Version 1) and #4346 (Version 2)

Done.

Done, mostly as of 346fb25, then polished in 6dbf721, 5381525, 9f0f936, and 91e6f27.