Cleanup, proper structure. Extended wrapping capabilities.
Ongoing: Recording hints to SIOX.