Improvements to Issue #210 and its documentation.