Some extra checks for finding unused display.

Along with some more lambda goodness.