Handle long-disp stuff more consistently