Minor syntax cleanups.