Fixed up default parsing code.