Fixup
Use named return values for previous callbacks