Broad cleanup.  -Jon I