Address review comments

https://github.com/apache/airflow/commit/a58506b2a68f0d4533b41feb67efb0caf34e14d8