Polish from Greg's feedback.