The enumeration code being up at the top was making things quite messy, so I split that code out to a separate set of files.
jp9000