Improving Self-Consistency in Underwater Mapping Through Laser-Based Loop Closure (Extended)