Add the two other imps from #4625 to UNUSED as well.