Revert "Don't delete, rename does it for me."

This reverts commit c8e129d7679334e4941abd5402b48f36e4096701.
Revert "Use brackets, no random lines."

This reverts commit 425d5e36f296891943dc95562040e6709cff27dc.
Seriously, don't change that before we had a vote about it!