I get the below error with notmuch-pick in upstream/contrib

error in process filter: notmuch-pick-clean-address: Symbol's function definition is void: notmuch-clean-address
error in process filter: Symbol's function definition is void: notmuch-clean-address

-aneesh