Remove remaining references to -i in memit