Update a few comments and reformat a decl for clarity.