Updates for "promise" edge cases (v1.3).