Don't know why these didn't get committed, the alleged "accumulated changes over time" (some of them anyway)