Fix iivari-display_* to match new (Trusty) reality.
Seems a bit like a mess.