Fixing dropped battle input glitch (and cleaning command contexts in general)