Potential fix for wrapper and list-entry namespace disparity.