Small tweaks from pull request #25.