Issue #72 tweaks.