Implement @keithbostic's review comments.