Further improvement of wrapping violation visitor