assorted-warning-cleanup-20071126