Minor cleanup; extra test for single-instance multimaps.