I think the patch is fine (although of course I cannot approve it). I, as it's author, do not. But, as I keep saying, I don't know what the proper fix is.
The more proper fix would be to never expand such expressions from ivopts; What are "such expressions"?