Commit some improvements for issue 611.