More duplicate symbol fixes.