Small convenience tweaks

Really doesn't deserve a separate commit; only separated because I
didn't want to accidentally mess up the previous commit.