Fixes switch-between to use more complete regexp for matching.