Fixing verification of return statements