First round of review of bigmerge

Some cleanup that should be obvious.