Hmm, botched the merge of expparse.y...