Fix @pdehaan comments.