Fixed with commits 9a8043d3be15 and 707160571431, but I keep that ticket open,
because targeting has to be improved (I'm working on it).