unix: some using cleanups.