Minor cleanup.  -Jon I