Drop-down "sig" and "struct" keywords.

Which makes what-is-what a bit more visible.
Relocate 'next' function to 'State' module.
Improve name.
Cleaner composition.