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

hlltbrk/autofac,hlltbrk/autofac,neoe1984/autofac,neoe1984/autofac,satish860/autofac,satish860/autofac,neoe1984/autofac,hlltbrk/autofac,satish860/autofac,satish860/autofac,hlltbrk/autofac,neoe1984/autofac