With the new quill format, some cleanups and
unnecessary double checks are no longer required.
This leads to a much better performance.