Leaner handling of null

- Includes various clean-ups.
- Addresses #11