Rework normal curvature computation.
Cleanup.