A bit of post-yak cleanup.
Fixed bug triggered by change.