Add extra strictness annotations