Simplify field initialization (part 2)