I have partially fixed this. At least fully-qualified names now work.

I need someone else to look at the case of unqualified enum names.