It is an issue with the module though.
Ouch... thanks for that. Committed :-) (EDIT : beware the SVN updates.. you may get more than you bargained for)
A lot more than just 'wrapping' going on.
Depends what one considers a "wrap". But hey, if you're going to do something, you may as well do it properly, I say! :-p