Did a pass over the whole variant api.