okay - fair point - have added a to-do to move these to the assignment-client target (since that's the only place they are needed as long as you agree with the point farther down)