Update variant usages to match v0.5 APIs