Include idiomatic's hand tidy changes.