Minor cleanups and self-review markups.
Minor cleanups and self-review markups.

neiljerram/felix,ocadotechnology/calico,matthewdupre/felix,anortef/calico,neiljerram/felix,Metaswitch/calico,beddari/calico,TrimBiggs/calico,alexhersh/calico,anortef/calico,alexhersh/calico,ocadotechnology/calico,neiljerram/felix,kasisnu/calico,beddari/calico,neiljerram/felix,matthewdupre/felix,TrimBiggs/calico,Metaswitch/calico,kasisnu/calico