Rename some trait
Remove unused imports
Remove the workaround for argument mode

argument mode is gone; no parens are required to pass &-ptr to stack closures.
Cleanup