#2863: Move common command outside of switch