Make migration more idiomatic.