Re-adding model skipping if it has no properties.

This was overlooked in the refactoring.
Make all models use Guava for equals/hashCode/toString.