Fix typos and add Outputable constraints to aid debugging.