finished 2.4, continued with 31.3

I have managed to finish the pass and merit tasks for 2.4. I have also
continued 31.3, and a commit of its final state is due in about 50
minutes. This is not something I look forward to.