Remove dependency on scribble-context