Fix #6424 (tab completion of macros)