Draft: Resolve #3485896 Parts / Incremental steps

See #3485896

This branch re-does the git history, to allow for incremental reviews.
The end diff is still the same, including non-desirable changes which are appended with prefix "BAD: " in the commit message.

Note: This completely destroys original authorship. Many of these changes were done by @nicxvan, @GhostOfDrupalPast and others.