diag/mbr/handoff: Code comments; reflow output