sparse_disp: more cleanup

Finish the changes started in last commit.