scoping and formatting cleanup

There were some use strict issues with moving some things from autoload
into preload, since autoload still doesn't use strict; :(