Ianjorgensen/lollipop

@jebeck  Finished moving the branch. Ready for review.
I don't understand what you see as the problems here, @ianjorgensen, but I also don't care to hold up the merge for this. Reorganization of preprocess to improve its efficiency can happen at some point down the road.