Fix fallout from removal of callable completers