Newer clippy from +nightly have new errors about where annotations can and cannot go. This commit fixes two of them.