various cleanups

just some stuff I stumbled over while working on jackalope-prismic