This incorporates various nits from the post-merge review on #21986. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>