Fix moving of handler annotations.

We accidentally dropped some of them, leading code-gen to fail.
Don't log -> guard things we needn't guard.