I suggest separating the checkstyle thing out unless you can get a decision from Jason quickly. This kind of patch that touches a ton of files is best gotten in fast, or it might generate a lot of rebase issues for other patches.