Fix terminology part 2. Also default to accept rather than resolve when no callback is given.