Factored out one more field.