Follow-up to r219534 to make symbolization more robust.