Slightly simplified the concatenation of macro parts.
Restore favorite on load, then only on the first typeless COMPANION_UPDATE event.