Update to new `impl Trait for Type` syntax.

As well as get rid of `move` since it's no longer a keyword.