Improved cleanup of aborted normalization. This should fix #762