#119: implement some feedback from #996.

This implements some feedback from #996.

@hjoliver, please review.