#4 works fine.
Thanks for the patch.
Marking as RTBC.