I figured the `.empty()` on line 476 would take care of both, keeping the footprint small. What do you think?