Cleaning up some interaction loose ends.