Minor tweaks after merging #3.