Make context work less-disruptively

They should be their entirely own system, really... but this'll do for
now.