Annoying testing bug fixed.
Flatten so we can support arbitrary input types.