Some syntax cleanups.