Minor syntax changes.