Remove waiting-on-couch hack
Advance casexml to where it has the support functions