Pulled in David's changes to sparse_disp