Fix bug involving weird sort order of nested tables

Also, tidies up the containers special case, handling in one place
and simplifying the type interface to only be Item