> Please prepare patches that apply on master so people who use master
> only can test them.

Patchset attached.

Rebased on:

   5bd8cfc14d4b0c78c07e65a583f42a10c4cbc06d
   Fix mishandling of symbols that look like numbers

Built and briefly tested locally.

I still haven't been able to reproduced the missing menu bar symptom
you described, with or without -q.