Slight syntax cleanup...