Issue #105: Final polish.