Simplify using modern syntax.