More refactoring of quickreturn scroll listeners