Aggregate reset columns

Allows aggregate functions to be ran without clearing columns as set in `select()`. Seems to fix #2560 without any problems. Almost seems too easy of a fix, thought storing `$this->columns` in a temporary variable was necessary. A bit worried there are false positives here, but unit tests are passing.