Use built-in and subr-x funs instead of dash.el
Drop s.el requirement

It's not used anyway