Since I apparently used null as commandsenders in multiple places, let's just move that...