A few random Predicate-related cleanups

I made these while working on adding a predicate for use by `adam view`, though I haven't gotten that to work yet, thought I'd send these out anyway.