Improve OrderedTypeContainer to allow mixing type definitions and other statements