I think I got pretty close: http://core.trac.wordpress.org/attachment/ticket/16574/16574.8.diff If you've found other edge cases, do let us know. -- http://scribu.net