cherry pick from branch laptop
dq to accept diffs. cover's a few cases only, yet.
was messing with ]} unmatched brace thing