Make deliver_later API nicer