A bit of post-yak cleanup.