Remove remaining calls to idiot/eidiot. Should fix 1479