wrap 2 in closures to fix 2 of 801 jshint warnings/errors...