Minor cleanups in help generation