More annotations.

See #100.