Some tidy up of the promise classes.