Expand test case to show bugs; fix bugs.

We were generating incorrect null checks like:

    {
      val temp$13: scala.type = scala.this;
      if (temp$13.$eq$eq(null))
        null
      else
        temp$13.Predef
    }