Used a series of regex searches to try to find as many instances of the old pattern as I could and update them.
@as
that's all this commit does. further commits will fix cli flags and such. see #2221