Fixup import cycle issue introduced with ParseContext custom SourceRoot