Second round of review comments

Fixes #965