Some more commander cleanup, param update handling code was doubled