logging needed not only for test; fix parser quirks