minor syntax cleanups.