Add short-circuiting for statements after return statements in function blocks