First round of Mike's nits for r1::queue