Some trivial cleanups.