This could use a bit of reformatting. I stripped off trailing spaces from a handful of lines but otherwise have kept it as is since the formatting issue is minor.
918ed61d9f