I did not use the wrapper method for those few occurences since it was too much work. I'm sorry :-D
See https://github.com/s9y/Serendipity/issues/236