SPARK-1729. Optimize imports.