Tighten annotations and rebuild.