Minor PR comment cleanups