Further changes to get suturing working with rapprentice.