Revert "Revert "Replace all "waste" variables with ~""

This reverts commit 3cc7595419b7b5dbdbd72f9f8cf272a7cfdf361a.