Remove reference to class that doesn't exist in this branch

Sorry
Tidy up use of new_assignee method

Not sure if this was broken in a merge conflict or through the
cherry-picking used to break up this branch's predecessor. Tests
pass now.