I put in the non-controversial parts. I did not put in the deadlock fix, pending review, and did not try to make a param.h.