Move kick handling into the simple command handler.