More review-fixes.