misc syntax cleanups