Adopted modern syntax.