Add support for aggregate functions as arguments to window functions.  Fix