second pass;
forgot to commit my first pass, which did more currying than was called for by the book;