more syntactic cleanups.