Yes, I think we need a cleanup here. It is a non-trivial change. I will do it in a separate CL.