Continuing work on the next CRUCS update. While the feature I'm working on is pretty invasive in the number of places where changes are needed, I've put in some helpers that make the new code in those places shorter and easier to read.