Change spire implementation to match current agda model.