Fix shadowing due to implicits.