Use finalization to catch spans that aren't explicitly stopped.
Minor indentation fix.