Remove unused variable for fix to avoid warning.
Comment out unused variable for fix to avoid warning.
Use "A unless B" insted of "B or A".

"B" is not side effect now.
Add assertions to check blockCalled flags in test.