In that case, I think your original patch is preferable. I apologize for not responding sooner.