Patch Set 4: Do not submit

(8 inline comments)

A few minor comments.

Also, could you please rebase on top of master.

This will require resolving a conflict in AllHeadlessTests since that class was reformatted to have once test per line so that adding new tests only involves modifying a single line.