take/drop in terms of split-at; cleaning up some related clutter