Fix up a couple of review comments: