Always skip current bracket when inserting at form terminal
Fix normal mode form swap

We changed visual form swapping to simple element swapping without
changing how normal mode worked