Address code review comments on 89086c3 (see https://github.com/JedWatson/keystone/pull/554#comments)
Address code review comments on 89086c3 (see https://github.com/JedWatson/keystone/pull/554#comments)

mikaoelitiana/keystone,danielmahon/keystone,frontyard/keystone,nickhsine/keystone,benkroeger/keystone,webteckie/keystone,Tangcuyu/keystone,douglasf/keystone,suryagh/keystone,naustudio/keystone,creynders/keystone,Redmart/keystone,Adam14Four/keystone,WofloW/keystone,w01fgang/keystone,asifiqbal84/keystone,Yaska/keystone,akoesnan/keystone,sebmck/keystone,danielmahon/keystone,onenorth/keystone,Pop-Code/keystone,andrewlinfoot/keystone,youprofit/keystone,chrisgornall/d29blog,pswoodworth/keystone,ONode/keystone,vokal/keystone,snowkeeper/keystone,kittens/keystone,dvdcastro/keystone,cermati/keystone,unsworn/keystone,gemscng/keystone,developer-prosenjit/keystone,andrewlinfoot/keystone,efernandesng/keystone,mbayfield/keystone,beni55/keystone,frontyard/keystone,wustxing/keystone,joerter/keystone,omnibrain/keystone,brianjd/keystone,WingedToaster/keystone,kristianmandrup/keystone,jstockwin/keystone,jeffreypriebe/keystone,wilsonfletcher/keystone,developer-prosenjit/keystone,Yaska/keystone,omnibrain/keystone,KZackery/keystone,Ftonso/keystone,joerter/keystone,Ftonso/keystone,Yaska/keystone,everisARQ/keystone,alobodig/keystone,SlashmanX/keystone,unsworn/keystone,kumo/keystone,Redmart/keystone,KZackery/keystone,qwales1/keystone,kristianmandrup/keystone,brianjd/keystone,Tangcuyu/keystone,wilsonfletcher/keystone,davibe/keystone,rafmsou/keystone,onenorth/keystone,asifiqbal84/keystone,matthewstyers/keystone,xyzteam2016/keystone,wmertens/keystone,MORE-HEALTH/keystone,rmarji/keystone,stosorio/keystone,nickhsine/keystone,udp/keystone,antonj/keystone,lojack/keystone,dryna/keystone-twoje-urodziny,trentmillar/keystone,wmertens/keystone,vokal/keystone,WofloW/keystone,andreufirefly/keystone,magalhas/keystone,woody0907/keystone,creynders/keystone,davidbanham/keystone,codevlabs/keystone,gcortese/keystone,pr1ntr/keystone,mbayfield/keystone,codevlabs/keystone,wustxing/keystone,michaelerobertsjr/keystone,Adam14Four/keystone,sarriaroman/keystone,jacargentina/keystone,kwangkim/keystone,vmkcom/keystone,jrit/keystone,benkroeger/keystone,lojack/keystone,dryna/keystone-twoje-urodziny,kloudsio/keystone,kidaa/keystone,magalhas/keystone,riyadhalnur/keystone,quenktechnologies/keystone,mekanics/keystone,qwales1/keystone,naustudio/keystone,davibe/keystone,sendyhalim/keystone,Freakland/keystone,jstockwin/keystone,lastjune/keystone,matthieugayon/keystone,vokal/keystone,ratecity/keystone,SlashmanX/keystone,tanbo800/keystone,w01fgang/keystone,chrisgornall/d29blog,snowkeeper/keystone,rafmsou/keystone,suryagh/keystone,davidbanham/keystone,geminiyellow/keystone,webteckie/keystone,ligson/keystone,ligson/keystone,kwangkim/keystone,47pages/keystone,mikaoelitiana/keystone,pr1ntr/keystone,kumo/keystone,frontyard/keystone,stosorio/keystone,cermati/keystone,jrit/keystone,andreufirefly/keystone,naustudio/keystone,concoursbyappointment/keystoneRedux,matthewstyers/keystone,michaelerobertsjr/keystone,youprofit/keystone,antonj/keystone,stunjiturner/keystone,benkroeger/keystone,matthieugayon/keystone,tony2cssc/keystone,tanbo800/keystone,DenisNeustroev/keystone,sendyhalim/keystone,trystant/keystone,efernandesng/keystone,belafontestudio/keystone,douglasf/keystone,BlakeRxxk/keystone,trentmillar/keystone,Pylipala/keystone,matthewstyers/keystone,tomasztunik/keystone,concoursbyappointment/keystoneRedux,udp/keystone,xyzteam2016/keystone,BlakeRxxk/keystone,jacargentina/keystone,linhanyang/keystone,andrewlinfoot/keystone,danielmahon/keystone,SJApps/keystone,akoesnan/keystone,geminiyellow/keystone,kloudsio/keystone,stunjiturner/keystone,jeffreypriebe/keystone,ratecity/keystone,riyadhalnur/keystone,the1sky/keystone,lastjune/keystone,alobodig/keystone,WingedToaster/keystone,vmkcom/keystone,beni55/keystone,everisARQ/keystone,Pop-Code/keystone,tony2cssc/keystone,francesconero/keystone,sarriaroman/keystone,DenisNeustroev/keystone,woody0907/keystone,SJApps/keystone,gcortese/keystone,Pylipala/keystone,the1sky/keystone,mekanics/keystone,belafontestudio/keystone,gemscng/keystone,trystant/keystone,trentmillar/keystone,MORE-HEALTH/keystone,tomasztunik/keystone,francesconero/keystone,kidaa/keystone,pswoodworth/keystone,ONode/keystone,Freakland/keystone,dvdcastro/keystone