#6359: Clean up.