Minor readibility cleanups.