Did you talk to @baris about this? I feel like we went back and forth on this during development.

I like that you DRYed up the big SA line, but I feel like the ideal is a combination of auto-generating the `-cleanup` suffix (the old approach) and just adding it to the list of types to add for DRYness (the new approach).