Duplication: minor duplication cleanup from last patch.