make prefix mandatory
Clean up and fix WithCommandSender.