Updated a few missing parens and  Annotations.