Minor rewrite, as requested in issue #69