Cleanup.
Use (define-named) and (to) syntax.