Remove s-trim functions since they stomp on s.el.