Should fix #2407. Also allows for the string containing the forward reference to appear inside a subexpression of the type annotation.