Merge "BCCContext is actually dead code."