Further work on Freyd categories

Blergh.