Add inspection on return stmt
Trying to rebase the branch ...