Removing 'short circuit' attribute for operators; properly short-circuiting AND/OR when used as an operator