get rid of extra annotation pass, perform full type analysis again right after method expansion
get rid of extra annotation pass, perform full type analysis again right after method expansion

darcs-hash:55140e29a8d48f38eda1e4ae18309835a7257950

dpwright/jhc,dpwright/jhc,dpwright/jhc,dpwright/jhc