If-let is also provided by subr-x, so remove for backward compatability