I'll look into it and make a call. Meanwhile, I committed the changes
assuming both to be control rate and including all the changes that you had
pointed out. Could you review that? Sorry about the diffs being a little
wonky - hope it's still readable.