Taking Herve's suggestion.  Closes #409.