Address @graydon's PR comments, refs #178.