add canonify() to some handle promises to prevent cf-promises FATAL error about invalid rvalue
Merge remote branch 'upstream/master' into parser