Fix self value in a block is changed with return value for Fixnum, nil, instance variable.

Fix #1504