Grouped these together because they were all simple changes that didn't fit into any of the other diffs in the stack.
See the first diff in the stack. We're no longer expecting to see these old codeVersions, so we're simplifying this code.
Depends on D8510