Strictness annotation tweaks