Tighten up CCKD statement parsing