@weierophinney Just to confirm: Here just remain to change the format isssue? (`else {`)

BTW, how do you prefer that PRs changes come? in form of new commits or do you prefer commit rewriting to end with a more clean history after merge the PR? I mean, I should push to this PR branch new commits or keep the branch with just a commit (making non fast-forward pushing)?.