Remove dependence on `subr-x`

Not available in earlier versions of emacs.