Update SAL annotations to v2, and add a couple of missing annotations.