All these changes (including the "Asize" -> "A size") ones below kind of clog up the diff unnecessarily.