Perhaps we can redefine only the helper, not the whole file -- to be checked.