Fixes issues with empty set and list types

See: #273 and #291 

The correct logic here should check for `None`, rather than truthiness.