Cleaner commit for PR #59.