Use correct block kinds in FunDef specs
Implement the "return" statement properly