Some minor cleaning up (#202).