Move 'require-package calls next to the related setup code
Fix hl-sexp anti-flicker advice