Tweaks after merging #14.