Moved deletion flags to place of usage.
Shorter, go fmt'ed code.