Add strictness annotations, unbox strict fields