Applied pre-formatted patch on "origin", fixed remaining style-related stuff.