Feedback from t-gnus-6_15-quimby branch.