Cleaning up benchmarks.  Starting on FPC encoding.