Remove trailing whitespace
display: Remove some more unnecessary NULL checks

Instead, replace them with another assert precondition.