Fixed function subtyping errors in previous updates. Annotation and formatting fixes.