Split the thread and addr into two separate arguments.  Fixes #3.