I think you're right. I think it would be cleaner to just have pre-constructed contexts.