Added short-circuiting 'and'/'or' boolean operators.