Tiny bit of cleanup post-merge.