Tighten annotations and fast returns.