Bugfix: More cases where if/else is not working as intended.

Bugfix: More cases where if/else is not working as intended.

In the previous commit I accidentally removed the "or" condition.

I also found that I needed to be more thorough with the logic.
The condition result needs to be returned and handled when immediately returning.
This then allows for subsequent conditions to use the condition result.
The condition result gets reset on each pass of the loop.
The block result needs to then retrieve the condition result to ensure the result is preserved across loop passes.