[libv2] cleanup changes from code review