Spraying for bugs

Some goofy cases were messing us up with change advisor and remove
advisee. All good now (hopefully)