[SPARK-4409] First pass after code review