c++: Avoid bogus -Wunused with recent change