Misc cleanup.

  Avoid shadowing the screen-variable.
  Avoid unreachable code.