Switched collections to iterables where possible and corrected omissions related to subinterfaces of SpatialDao