Apply review comments from #6612. (#6616)
Apply review comments from #6612. (#6616)

TBR @abarth
cbracken/flutter,flutter/flutter,tvolkert/flutter,cbracken/flutter,turnidge/flutter,flutter/flutter,flutter/flutter,cbracken/flutter,flutter/flutter,flutter/flutter,flutter/flutter,Hixie/flutter,flutter/flutter,cbracken/flutter,cbracken/flutter,Hixie/flutter,flutter/flutter,tvolkert/flutter,Hixie/flutter,cbracken/flutter,tvolkert/flutter,cbracken/flutter,Hixie/flutter,flutter/flutter,turnidge/flutter,Hixie/flutter,tvolkert/flutter,cbracken/flutter,Hixie/flutter,tvolkert/flutter,turnidge/flutter,turnidge/flutter,Hixie/flutter,cbracken/flutter,tvolkert/flutter,tvolkert/flutter,tvolkert/flutter,flutter/flutter,tvolkert/flutter,cbracken/flutter,Hixie/flutter,Hixie/flutter,turnidge/flutter,Hixie/flutter,tvolkert/flutter