VE-164: minor cleanup.