Mostly fixed logical operator parsing (for real this time)