Some minor cleanup - related to what is passed into IIFEs and ES5 stuff