Consumed analysis: bugfix for operator calls.  Also fixes some formatting
issues, a few testcases, and kills fish.