Improvements to SpotLightHelper as suggested by @WestLangley in 890a7571fd40b2c2f1fe79486621fa925d796245.
Updated builds.