Followups to #97.

Followups to #97.