Small refactor and patch to prevend delegation at `#document`