Tiny bit of cleanup relating to last commit