Partial fix for #12014 Outer typedef incorrectly applied within namespace

Partial fix for #12014 Outer typedef incorrectly applied within namespace #13704