Allow switch marker state to take an instrument object or a string (more compatible with our way of doing things)