PS7 now past typecheck problems