Fixed return statement expression analysis