> Alexander: Mika just merged ft-rebased into master. All work can be
> based on master again.
OK

> And what I said about "take the unneeded expansions out": scratch
> that. It's cleaner if that's done in a separate patch. Either
> *before* (which is probably preferable) or *after* the patch
> discussed in this bug. I'm fine either way, just don't squash it
> into one patch.
That does still apply, I guess.