With as heavily modified as this swath of code has been, there's no reason for it not to be 4-space 1tbs.
Also wrap lines at column 100, a lot of the line-ending comments are extending past this.