Remove use of ‘if-let’ for Emacs 26+ compatibility