Doesn't have to be everything now since they aren't related to this PR or as a separate commit to this PR. It should make the v4.0 transition easier if variables are readable.