Fix problems with defer(), and add extra promise operations useful for diagnostics.