Improvements; another useful commit message.