Improved if statement condition handling

If statements can now use the logical AND and OR operators in the
condition.