Adding in a few more `drop-while`s