Make Quill2 safer, prepare for split more.
Make Quill2 safer, prepare more for split.