cw2: Tiny cleanliness fixup