Cleaned up parse_expression_conditional