Add handling for empty non-collection objects.

This commit also contains a selection of changes after running through
metrics again.
Bump version to 0.1.0