Remove need for all special arguments in minification, and restructure code to avoid warnings.