Drop dependency on s.el