Updates to tighten up our analytics JS