Case 2882 - Cleanup and additions.