Re: [COMMIT] Apply Stephen's bugfix to my advice.el changes