Changes according to review documented in issue #406