I'm guessing the changes to `@Fallback` are just incidental cleanup? Any reason for these?