Leaner handling of null

Includes various clean-ups.
Merge pull request #197 from scala/issue-11

Leaner handling of null