Concur. Let's make all the code style / modernisation updates in one fell swoop.