More modern syntax changes.