finish removing the Context and c.Type parameters

that were getting passed around all over the place