More multilib futzing