that the inner one is completely empty.  Per recent discussion.  Also some
cosmetic cleanups in nearby code.