Moves makeDebugContext into an option