thingy: Fix several bugs with Thingy#remove.