Bring over lost listing bits from emc-97r1-branch.