Tighten annotations.