Some remaining annotation fixes.