Slight syntax changes.