Minor cleanups.
Minor cleanups.

milessabin/shapeless,alexarchambault/shapeless,fthomas/shapeless,wheaties/shapeless,Atry/shapeless,lukasz-golebiewski/shapeless,lambdista/shapeless,roberth/shapeless,isaka/shapeless,khronnuz/shapeless,liff/shapeless,joescii/shapeless,TomasMikula/shapeless,retronym/shapeless,notxcain/shapeless,clhodapp/shapeless,malcolmgreaves/shapeless,tek/shapeless,triggerNZ/shapeless