Fix more ambiguous imports.