Some syntactic cleansing