Fixing PlotContext handling to actually use the context in the Doc, instead of creating a new one