Address review comments from Matt on the sort_includes.py script.