More constuction cleanups.
More constuction cleanups.

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