Tiny optimisation to CommandHandler