Add slightly more comprehensive parsing to isql