xspy: Clean up and add a small sed patch.