Gone back to the original design with anonymous fixpoints.
Just finished merging in some of the nice redesign I did for the other version.
All tests passing which should.