Fix extraction in cases whose body is on a new line
Fix approximated insertion position when inserting in templates
Add new block at rhs of ValDef as InsertionPosition