Re #419 changes based on feedback in pull request.