toplev minor cleanups