Code review fixmes

Hmm. Something must have been up with the command I ran because I thought that might work but I didn't get anything in the final callback. I'll try again when I'm on a computer.