implicit switch -- closes #2490°

not sure if there's a cleaner way instead of splicing :). Could rewrite the old token but that seems as bad