Minor cleanup in preparation for switching to portable libraries.
Minor cleanup in preparation for switching to portable libraries.

pagebrooks/Autofac,twsouthwick/Autofac,autofac/Autofac,twsouthwick/Autofac,neoe1984/https-github.com-autofac-Autofac,LexxFedoroff/Autofac,SeriaWei/Autofac,laizhan/autofac,SeriaWei/Autofac,jruckert/Autofac,zjmpds/Autofac,onovotny/Autofac,zmaruo/Autofac,laizhan/autofac,twsouthwick/Autofac,liujunhua/Autofac,lijianguang/Autofac,laizhan/autofac,onovotny/Autofac,jango2015/Autofac,twsouthwick/Autofac,jruckert/Autofac,LexxFedoroff/Autofac,oconics/Autofac,liujunhua/Autofac,neoe1984/https-github.com-autofac-Autofac,csantero/Autofac,pagebrooks/Autofac,laizhan/autofac,twsouthwick/Autofac,csantero/Autofac,oconics/Autofac