Added some strictness annotations.