Revised per comments on commit 6e3802e; issue #30