Various bits of cleanup related to jump scroll functionality