Reinstate cauterization with knife, alternative to #2794

Aw dangit if else.

Astyling in separate commits

Fixes #2791
Alternative to #2794