(no, these don't really need to be rebases, but i've already made a deal with the devil)