The fast file peeking code in this branch seems to have an issue with recognising

some types. Which results in None type names being returned by it.

Since I don't want to switch to slow file peeking by default, and with the
file peekign code being as complicated as it is, it seemed easiest to bandage
the issue here.


Former-commit-id: d60a5659ec01c1cf6297aefb491f6decdecad1d4