[PATCH 00/11] treewide: mask then shift defects and style updates