Work on making the type theorems ok for REPL proof